You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by hi...@apache.org on 2001/05/14 07:00:39 UTC
cvs commit: xml-batik/xdocs/skins/xml.apache.org/stylesheets book2project.xsl changes2document.xsl context2label.xsl copyover.xsl directory2project.xsl document2html.xsl document2image.xsl document2project.xsl faqs2document.xsl scan4resources.xsl spec2html.xsl todo2document.xsl xspdoc2document.xsl
hillion 01/05/13 22:00:39
Modified: . build.xml
resources/org/apache/batik/apps/svgbrowser/resources
GUI.properties
sources/org/apache/batik/apps/svgbrowser Application.java
JSVGViewerFrame.java Main.java
PreferenceDialog.java
sources/org/apache/batik/util/gui LanguageDialog.java
xdocs/skins/printer loader.xml
xdocs/skins/printer/resources simple.css
xdocs/skins/printer/stylesheets book2project.xsl
changes2document.xsl copyover.xsl
directory2project.xsl document2html.xsl
document2project.xsl faqs2document.xsl
scan4resources.xsl spec2html.xsl todo2document.xsl
xdocs/skins/xml.apache.org loader.xml
xdocs/skins/xml.apache.org/stylesheets book2project.xsl
changes2document.xsl context2label.xsl copyover.xsl
directory2project.xsl document2html.xsl
document2image.xsl document2project.xsl
faqs2document.xsl scan4resources.xsl spec2html.xsl
todo2document.xsl
Added: lib/build stylebook-1.0-b3_xalan-2.jar xalan-2.0.1.jar
xerces_1_3_1.jar
Removed: lib/build stylebook-1.0-b2.jar xalan_1_2_D02.jar
xerces_1_2.jar
xdocs/skins/xml.apache.org/stylesheets xspdoc2document.xsl
Log:
- Linked Vincent's preference dialog to the browser,
- micellaneous fixes,
- updated stylebook and as a consequence xalan, xerces, and all the XSL
stuff in xdocs/
Revision Changes Path
1.65 +4 -2 xml-batik/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-batik/build.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- build.xml 2001/05/11 17:05:45 1.64
+++ build.xml 2001/05/14 05:00:00 1.65
@@ -44,7 +44,7 @@
[win32] .\build.bat help
- $Id: build.xml,v 1.64 2001/05/11 17:05:45 vhardy Exp $
+ $Id: build.xml,v 1.65 2001/05/14 05:00:00 hillion Exp $
-->
@@ -105,7 +105,9 @@
<path id="libs-build-classpath">
<fileset dir="lib/build">
- <include name="*.jar"/>
+ <include name="stylebook*.jar"/>
+ <include name="xalan*.jar"/>
+ <include name="xerces*.jar"/>
</fileset>
</path>
1.1 xml-batik/lib/build/stylebook-1.0-b3_xalan-2.jar
<<Binary file>>
1.1 xml-batik/lib/build/xalan-2.0.1.jar
<<Binary file>>
1.1 xml-batik/lib/build/xerces_1_3_1.jar
<<Binary file>>
1.19 +11 -53 xml-batik/resources/org/apache/batik/apps/svgbrowser/resources/GUI.properties
Index: GUI.properties
===================================================================
RCS file: /home/cvs/xml-batik/resources/org/apache/batik/apps/svgbrowser/resources/GUI.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- GUI.properties 2001/05/14 04:30:44 1.18
+++ GUI.properties 2001/05/14 05:00:08 1.19
@@ -9,7 +9,7 @@
# The viewer's GUI resources.
#
# Author: stephane@hillion.org
-# $Id: GUI.properties,v 1.18 2001/05/14 04:30:44 vhardy Exp $
+# $Id: GUI.properties,v 1.19 2001/05/14 05:00:08 hillion Exp $
#
ViewSource.width = 750
@@ -42,11 +42,11 @@
# Definition of the menu bar
#
-MenuBar = File View Processing Go Options Tools
+MenuBar = File View Processing Go Tools
# File menu ################
File = Open OpenLocation NewWindow Reload - \
- Print ExportAs - Close Exit
+ Print ExportAs - Preferences - Close Exit
File.type = MENU
File.text = File
File.mnemonic = F
@@ -79,6 +79,13 @@
Reload.action = ReloadAction
Reload.accelerator = Ctrl+R
+Preferences.type = ITEM
+Preferences.text = Preferences
+Preferences.icon = resources/blank.gif
+Preferences.mnemonic = P
+Preferences.action = PreferencesAction
+Preferences.accelerator = Ctrl+G
+
Close.type = ITEM
Close.text = Close
Close.icon = resources/blank.gif
@@ -214,55 +221,6 @@
HistoryMarker.type = ITEM
HistoryMarker.text = @@@
-# Options menu ############
-Options = ShowRendering AutoAdjust DoubleBuffer - Language StyleSheet \
- - ShowDebug
-Options.type = MENU
-Options.text = Options
-Options.mnemonic = O
-
-ShowRendering.type = CHECK
-ShowRendering.text = Show Rendering
-ShowRendering.icon = resources/blank.gif
-ShowRendering.mnemonic = S
-ShowRendering.action = ShowRenderingAction
-ShowRendering.selected = false
-ShowRendering.enabled = false
-
-AutoAdjust.type = CHECK
-AutoAdjust.text = Auto Adjust Window
-AutoAdjust.icon = resources/blank.gif
-AutoAdjust.mnemonic = A
-AutoAdjust.action = AutoAdjustAction
-AutoAdjust.selected = true
-
-DoubleBuffer.type = CHECK
-DoubleBuffer.text = Enable Double Buffering
-DoubleBuffer.icon = resources/blank.gif
-DoubleBuffer.mnemonic = D
-DoubleBuffer.action = DoubleBufferAction
-DoubleBuffer.selected = true
-
-Language.type = ITEM
-Language.text = Choose User Languages
-Language.icon = resources/language.gif
-Language.mnemonic = L
-Language.action = LanguageAction
-Language.accelerator = Ctrl+L
-
-StyleSheet.type = ITEM
-StyleSheet.text = Choose User Stylesheet
-StyleSheet.icon = resources/blank.gif
-StyleSheet.mnemonic = C
-StyleSheet.action = StyleSheetAction
-StyleSheet.accelerator = Ctrl+C
-
-ShowDebug.type = CHECK
-ShowDebug.text = Show Debug Traces
-ShowDebug.icon = resources/blank.gif
-ShowDebug.mnemonic = D
-ShowDebug.action = ShowDebugAction
-ShowDebug.selected = false
# Tools menu ################
Tools = Monitor DOMViewer FindDialog
@@ -351,7 +309,7 @@
PreferenceDialog.label.network = Network
PreferenceDialog.label.applications = Applications
PreferenceDialog.label.auto.adjust.window = Auto Adjust Window
-PreferenceDialog.label.enable.double.buffering = Enable Double Buffereing
+PreferenceDialog.label.enable.double.buffering = Enable Double Buffering
PreferenceDialog.label.show.rendering = Show Rendering
PreferenceDialog.label.show.debug.trace = Show Debug Trace
PreferenceDialog.label.host = Proxy Host
1.2 +16 -1 xml-batik/sources/org/apache/batik/apps/svgbrowser/Application.java
Index: Application.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/Application.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Application.java 2001/03/08 01:21:05 1.1
+++ Application.java 2001/05/14 05:00:09 1.2
@@ -14,7 +14,7 @@
* This interface represents a SVG viewer application.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: Application.java,v 1.1 2001/03/08 01:21:05 hillion Exp $
+ * @version $Id: Application.java,v 1.2 2001/05/14 05:00:09 hillion Exp $
*/
public interface Application {
@@ -43,4 +43,19 @@
*/
String getXMLParserClassName();
+ /**
+ * Shows the preference dialog.
+ */
+ void showPreferenceDialog(JSVGViewerFrame f);
+
+ /**
+ * Returns the user languages.
+ */
+ String getLanguages();
+
+ /**
+ * Returns the user stylesheet uri.
+ * @return null if no user style sheet was specified.
+ */
+ String getUserStyleSheetURI();
}
1.36 +48 -192 xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
Index: JSVGViewerFrame.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- JSVGViewerFrame.java 2001/05/10 17:24:43 1.35
+++ JSVGViewerFrame.java 2001/05/14 05:00:10 1.36
@@ -107,7 +107,6 @@
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.gui.DOMViewer;
-import org.apache.batik.util.gui.LanguageDialog;
import org.apache.batik.util.gui.LocationBar;
import org.apache.batik.util.gui.MemoryMonitor;
import org.apache.batik.util.gui.URIChooser;
@@ -133,7 +132,7 @@
* This class represents a SVG viewer swing frame.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: JSVGViewerFrame.java,v 1.35 2001/05/10 17:24:43 hillion Exp $
+ * @version $Id: JSVGViewerFrame.java,v 1.36 2001/05/14 05:00:10 hillion Exp $
*/
public class JSVGViewerFrame
extends JFrame
@@ -159,6 +158,7 @@
public final static String PRINT_ACTION = "PrintAction";
public final static String EXPORT_AS_PNG_ACTION = "ExportAsPNGAction";
public final static String EXPORT_AS_JPG_ACTION = "ExportAsJPGAction";
+ public final static String PREFERENCES_ACTION = "PreferencesAction";
public final static String CLOSE_ACTION = "CloseAction";
public final static String VIEW_SOURCE_ACTION = "ViewSourceAction";
public final static String EXIT_ACTION = "ExitAction";
@@ -168,12 +168,6 @@
public final static String PREVIOUS_TRANSFORM_ACTION = "PreviousTransformAction";
public final static String NEXT_TRANSFORM_ACTION = "NextTransformAction";
public final static String STOP_ACTION = "StopAction";
- public final static String DOUBLE_BUFFER_ACTION = "DoubleBufferAction";
- public final static String AUTO_ADJUST_ACTION = "AutoAdjustAction";
- public final static String SHOW_DEBUG_ACTION = "ShowDebugAction";
- public final static String SHOW_RENDERING_ACTION = "ShowRenderingAction";
- public final static String LANGUAGE_ACTION = "LanguageAction";
- public final static String STYLE_SHEET_ACTION = "StyleSheetAction";
public final static String MONITOR_ACTION = "MonitorAction";
public final static String DOM_VIEWER_ACTION = "DOMViewerAction";
public final static String SET_TRANSFORM_ACTION = "SetTransformAction";
@@ -288,11 +282,6 @@
protected DOMViewer domViewer;
/**
- * The language dialog.
- */
- protected LanguageDialog languageDialog;
-
- /**
* The Find dialog.
*/
protected FindDialog findDialog;
@@ -303,11 +292,6 @@
protected JAffineTransformChooser.Dialog transformDialog;
/**
- * The user style dialog.
- */
- protected UserStyleDialog styleSheetDialog;
-
- /**
* The location bar.
*/
protected LocationBar locationBar;
@@ -318,16 +302,6 @@
protected StatusBar statusBar;
/**
- * The user languages.
- */
- protected String userLanguages = "en";
-
- /**
- * The user style sheet URI.
- */
- protected String userStyleSheetURI;
-
- /**
* The initial frame title.
*/
protected String title;
@@ -343,21 +317,11 @@
protected TransformHistory transformHistory = new TransformHistory();
/**
- * the ShowRenderingAction.
- */
- protected ShowRenderingAction showRenderingAction = new ShowRenderingAction();
-
- /**
* Creates a new SVG viewer frame.
*/
public JSVGViewerFrame(Application app) {
application = app;
- String s = Locale.getDefault().getLanguage();
- if (!userLanguages.equals(s)) {
- userLanguages = s + "," + userLanguages;
- }
-
addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
application.closeJSVGViewerFrame(JSVGViewerFrame.this);
@@ -373,6 +337,7 @@
listeners.put(PRINT_ACTION, new PrintAction());
listeners.put(EXPORT_AS_PNG_ACTION, new ExportAsPNGAction());
listeners.put(EXPORT_AS_JPG_ACTION, new ExportAsJPGAction());
+ listeners.put(PREFERENCES_ACTION, new PreferencesAction());
listeners.put(CLOSE_ACTION, new CloseAction());
listeners.put(EXIT_ACTION, application.createExitAction(this));
listeners.put(VIEW_SOURCE_ACTION, new ViewSourceAction());
@@ -382,12 +347,6 @@
listeners.put(PREVIOUS_TRANSFORM_ACTION, previousTransformAction);
listeners.put(NEXT_TRANSFORM_ACTION, nextTransformAction);
listeners.put(STOP_ACTION, stopAction);
- listeners.put(DOUBLE_BUFFER_ACTION, new DoubleBufferAction());
- listeners.put(AUTO_ADJUST_ACTION, new AutoAdjustAction());
- listeners.put(SHOW_DEBUG_ACTION, new ShowDebugAction());
- listeners.put(SHOW_RENDERING_ACTION, showRenderingAction);
- listeners.put(LANGUAGE_ACTION, new LanguageAction());
- listeners.put(STYLE_SHEET_ACTION, new StyleSheetAction());
listeners.put(MONITOR_ACTION, new MonitorAction());
listeners.put(DOM_VIEWER_ACTION, new DOMViewerAction());
listeners.put(SET_TRANSFORM_ACTION, new SetTransformAction());
@@ -582,6 +541,20 @@
}
/**
+ * Whether to show the debug traces.
+ */
+ public void setDebug(boolean b) {
+ debug = b;
+ }
+
+ /**
+ * Whether to auto adjust the canvas to the size of the document.
+ */
+ public void setAutoAdjust(boolean b) {
+ autoAdjust = b;
+ }
+
+ /**
* Returns the main JSVGCanvas of this frame.
*/
public JSVGCanvas getJSVGCanvas() {
@@ -591,7 +564,7 @@
/**
* Needed to work-around JFileChooser bug with abstract Files
*/
- public File makeAbsolute(File f){
+ private static File makeAbsolute(File f){
if(!f.isAbsolute()){
return f.getAbsoluteFile();
}
@@ -700,29 +673,20 @@
// Copy the current settings to the new window.
vf.autoAdjust = autoAdjust;
- AutoAdjustAction aaa;
- aaa = (AutoAdjustAction)vf.listeners.get(AUTO_ADJUST_ACTION);
- aaa.menuItem.setSelected(autoAdjust);
-
vf.debug = debug;
- ShowDebugAction sda;
- sda = (ShowDebugAction)vf.listeners.get(SHOW_DEBUG_ACTION);
- sda.menuItem.setSelected(debug);
-
vf.svgCanvas.setProgressivePaint(svgCanvas.getProgressivePaint());
- ShowRenderingAction sra;
- sra = (ShowRenderingAction)vf.listeners.get(SHOW_RENDERING_ACTION);
- sra.menuItem.setSelected(svgCanvas.getProgressivePaint());
-
vf.svgCanvas.setDoubleBufferedRendering
(svgCanvas.getDoubleBufferedRendering());
- vf.showRenderingAction.update(!svgCanvas.getDoubleBufferedRendering());
- DoubleBufferAction dba;
- dba = (DoubleBufferAction)vf.listeners.get(DOUBLE_BUFFER_ACTION);
- dba.menuItem.setSelected(svgCanvas.getDoubleBufferedRendering());
+ }
+ }
- vf.userLanguages = userLanguages;
- vf.userStyleSheetURI = userStyleSheetURI;
+ /**
+ * To show the preferences.
+ */
+ public class PreferencesAction extends AbstractAction {
+ public PreferencesAction() {}
+ public void actionPerformed(ActionEvent e) {
+ application.showPreferenceDialog(JSVGViewerFrame.this);
}
}
@@ -1150,81 +1114,6 @@
}
/**
- * To enable the double buffering.
- */
- public class DoubleBufferAction
- extends AbstractAction
- implements JComponentModifier {
- public JCheckBoxMenuItem menuItem;
- public DoubleBufferAction() {}
- public void actionPerformed(ActionEvent e) {
- boolean b = menuItem.isSelected();
- showRenderingAction.update(!b);
- svgCanvas.setDoubleBufferedRendering(b);
- }
-
- public void addJComponent(JComponent c) {
- menuItem = (JCheckBoxMenuItem)c;
- }
- }
-
- /**
- * To adjust the window size on load.
- */
- public class AutoAdjustAction
- extends AbstractAction
- implements JComponentModifier {
- public JCheckBoxMenuItem menuItem;
- public AutoAdjustAction() {}
- public void actionPerformed(ActionEvent e) {
- autoAdjust = menuItem.isSelected();
- }
-
- public void addJComponent(JComponent c) {
- menuItem = (JCheckBoxMenuItem)c;
- }
- }
-
- /**
- * To enable the debug traces.
- */
- public class ShowDebugAction
- extends AbstractAction
- implements JComponentModifier {
- public JCheckBoxMenuItem menuItem;
- public ShowDebugAction() {}
- public void actionPerformed(ActionEvent e) {
- debug = menuItem.isSelected();
- time = System.currentTimeMillis();
- }
-
- public void addJComponent(JComponent c) {
- menuItem = (JCheckBoxMenuItem)c;
- }
- }
-
- /**
- * To enable progressive rendering.
- */
- public class ShowRenderingAction
- extends AbstractAction
- implements JComponentModifier {
- public JCheckBoxMenuItem menuItem;
- public ShowRenderingAction() {}
- public void actionPerformed(ActionEvent e) {
- svgCanvas.setProgressivePaint(menuItem.isSelected());
- }
-
- public void addJComponent(JComponent c) {
- menuItem = (JCheckBoxMenuItem)c;
- }
-
- public void update(boolean enabled) {
- menuItem.setEnabled(enabled);
- }
- }
-
- /**
* To show the set transform dialog
*/
public class SetTransformAction extends AbstractAction {
@@ -1249,50 +1138,6 @@
}
/**
- * To show the language dialog.
- */
- public class LanguageAction extends AbstractAction {
- public LanguageAction() {}
- public void actionPerformed(ActionEvent e) {
- if (languageDialog == null) {
- languageDialog = new LanguageDialog(JSVGViewerFrame.this);
-
- Rectangle fr = getBounds();
- Dimension ld = languageDialog.getSize();
- languageDialog.setLocation(fr.x + (fr.width - ld.width) / 2,
- fr.y + (fr.height - ld.height) / 2);
- languageDialog.setLanguages(userLanguages);
- }
- if (languageDialog.showDialog() == LanguageDialog.OK_OPTION) {
- userLanguages = languageDialog.getLanguages();
- }
- }
- }
-
- /**
- * To display the user style options dialog.
- */
- public class StyleSheetAction extends AbstractAction {
- public StyleSheetAction() {}
- public void actionPerformed(ActionEvent e) {
- if (styleSheetDialog == null) {
- styleSheetDialog = new UserStyleDialog(JSVGViewerFrame.this);
- styleSheetDialog.pack();
- Rectangle fr = getBounds();
- Dimension sd = styleSheetDialog.getSize();
- styleSheetDialog.setLocation(fr.x + (fr.width - sd.width) / 2,
- fr.y + (fr.height - sd.height) / 2);
- if (userStyleSheetURI != null) {
- styleSheetDialog.setPath(userStyleSheetURI);
- }
- }
- if (styleSheetDialog.showDialog() == UserStyleDialog.OK_OPTION) {
- userStyleSheetURI = styleSheetDialog.getPath();
- }
- }
- }
-
- /**
* To display the memory monitor.
*/
public class MonitorAction extends AbstractAction {
@@ -1614,14 +1459,25 @@
*/
public void linkActivated(LinkActivationEvent e) {
String s = e.getReferencedURI();
- if (s.indexOf("#") != -1) {
- localHistory.update(e.getReferencedURI());
- backAction.update();
- forwardAction.update();
-
- transformHistory = new TransformHistory();
- previousTransformAction.update();
- nextTransformAction.update();
+ if (svgDocument != null) {
+ try {
+ SVGOMDocument doc = (SVGOMDocument)svgDocument;
+ URL docURL = doc.getURLObject();
+ URL url = new URL(docURL, s);
+ if (!url.sameFile(docURL)) {
+ return;
+ }
+ } catch (MalformedURLException ex) {
+ }
+ if (s.indexOf("#") != -1) {
+ localHistory.update(e.getReferencedURI());
+ backAction.update();
+ forwardAction.update();
+
+ transformHistory = new TransformHistory();
+ previousTransformAction.update();
+ nextTransformAction.update();
+ }
}
}
@@ -1676,7 +1532,7 @@
* Returns the language settings.
*/
public String getLanguages() {
- return userLanguages;
+ return application.getLanguages();
}
/**
@@ -1684,7 +1540,7 @@
* @return null if no user style sheet was specified.
*/
public String getUserStyleSheetURI() {
- return userStyleSheetURI;
+ return application.getUserStyleSheetURI();
}
/**
1.12 +97 -13 xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Main.java 2001/05/08 01:08:29 1.11
+++ Main.java 2001/05/14 05:00:10 1.12
@@ -13,12 +13,15 @@
import java.awt.event.ActionEvent;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
@@ -32,6 +35,8 @@
import javax.swing.plaf.FontUIResource;
import org.apache.batik.css.CSSDocumentHandler;
+
+import org.apache.batik.util.PreferenceManager;
import org.apache.batik.util.XMLResourceDescriptor;
import org.apache.batik.util.gui.resource.ResourceManager;
@@ -40,7 +45,7 @@
* This class contains the main method of an SVG viewer.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: Main.java,v 1.11 2001/05/08 01:08:29 vhardy Exp $
+ * @version $Id: Main.java,v 1.12 2001/05/14 05:00:10 hillion Exp $
*/
public class Main implements Application {
@@ -58,11 +63,6 @@
public final static String CSS_PARSER_CLASS_NAME_KEY = "org.w3c.css.sac.parser";
/**
- * The XML parser class name key.
- */
- public final static String XML_PARSER_CLASS_NAME_KEY = "org.xml.sax.driver";
-
- /**
* The gui resources file name
*/
public final static String RESOURCES =
@@ -102,14 +102,14 @@
}
/**
- * The number of viewer frames.
+ * The viewer frames.
*/
- protected int viewerFrames;
+ protected List viewerFrames = new LinkedList();
/**
- * The main frame.
+ * The preference dialog.
*/
- protected JSVGViewerFrame mainFrame;
+ protected PreferenceDialog preferenceDialog;
/**
* Creates a new application.
@@ -280,13 +280,13 @@
* Creates and shows a new viewer frame.
*/
public JSVGViewerFrame createAndShowJSVGViewerFrame() {
- viewerFrames++;
- mainFrame = new JSVGViewerFrame(this);
+ JSVGViewerFrame mainFrame = new JSVGViewerFrame(this);
mainFrame.setSize(resources.getInteger("Frame.width"),
resources.getInteger("Frame.height"));
mainFrame.setIconImage(frameIcon.getImage());
mainFrame.setTitle(resources.getString("Frame.title"));
mainFrame.show();
+ viewerFrames.add(mainFrame);
return mainFrame;
}
@@ -294,7 +294,8 @@
* Closes the given viewer frame.
*/
public void closeJSVGViewerFrame(JSVGViewerFrame f) {
- if (--viewerFrames == 0) {
+ viewerFrames.remove(f);
+ if (viewerFrames.size() == 0) {
System.exit(0);
}
f.setVisible(false);
@@ -324,5 +325,88 @@
*/
public String getXMLParserClassName() {
return XMLResourceDescriptor.getXMLParserClassName();
+ }
+
+ /**
+ * Shows the preference dialog.
+ */
+ public void showPreferenceDialog(JSVGViewerFrame f) {
+ if (preferenceDialog == null) {
+ Map defaults = new HashMap(11);
+
+ defaults.put(PreferenceDialog.PREFERENCE_KEY_LANGUAGES,
+ Locale.getDefault().getLanguage());
+ defaults.put(PreferenceDialog.PREFERENCE_KEY_SHOW_RENDERING,
+ Boolean.FALSE);
+ defaults.put(PreferenceDialog.PREFERENCE_KEY_AUTO_ADJUST_WINDOW,
+ Boolean.TRUE);
+ defaults.put(PreferenceDialog.PREFERENCE_KEY_ENABLE_DOUBLE_BUFFERING,
+ Boolean.TRUE);
+ defaults.put(PreferenceDialog.PREFERENCE_KEY_SHOW_DEBUG_TRACE,
+ Boolean.FALSE);
+ defaults.put(PreferenceDialog.PREFERENCE_KEY_PROXY_HOST,
+ "");
+ defaults.put(PreferenceDialog.PREFERENCE_KEY_PROXY_PORT,
+ "");
+
+ XMLPreferenceManager manager;
+ manager = new XMLPreferenceManager("batik-preferences.xml", defaults);
+ try {
+ manager.load();
+ } catch (IOException e) {
+ }
+ setPreferences(manager);
+ preferenceDialog = new PreferenceDialog(manager);
+ }
+ if (preferenceDialog.showDialog() == PreferenceDialog.OK_OPTION) {
+ PreferenceManager manager = preferenceDialog.getPreferenceManager();
+ try {
+ manager.save();
+ } catch (IOException e) {
+ }
+ setPreferences(manager);
+ }
+ }
+
+ private void setPreferences(PreferenceManager manager) {
+ Iterator it = viewerFrames.iterator();
+ while (it.hasNext()) {
+ JSVGViewerFrame vf = (JSVGViewerFrame)it.next();
+ boolean db = manager.getBoolean
+ (PreferenceDialog.PREFERENCE_KEY_ENABLE_DOUBLE_BUFFERING);
+ vf.getJSVGCanvas().setDoubleBufferedRendering(db);
+ boolean sr = manager.getBoolean
+ (PreferenceDialog.PREFERENCE_KEY_SHOW_RENDERING);
+ vf.getJSVGCanvas().setProgressivePaint(sr);
+ boolean d = manager.getBoolean
+ (PreferenceDialog.PREFERENCE_KEY_SHOW_DEBUG_TRACE);
+ vf.setDebug(d);
+ boolean aa = manager.getBoolean
+ (PreferenceDialog.PREFERENCE_KEY_AUTO_ADJUST_WINDOW);
+ vf.setAutoAdjust(aa);
+ }
+ }
+
+ /**
+ * Returns the user languages.
+ */
+ public String getLanguages() {
+ if (preferenceDialog == null) {
+ return Locale.getDefault().getLanguage();
+ }
+ return preferenceDialog.getPreferenceManager().getString
+ (PreferenceDialog.PREFERENCE_KEY_LANGUAGES);
+ }
+
+ /**
+ * Returns the user stylesheet uri.
+ * @return null if no user style sheet was specified.
+ */
+ public String getUserStyleSheetURI() {
+ if (preferenceDialog == null) {
+ return null;
+ }
+ return preferenceDialog.getPreferenceManager().getString
+ (PreferenceDialog.PREFERENCE_KEY_USER_STYLESHEET);
}
}
1.4 +9 -2 xml-batik/sources/org/apache/batik/apps/svgbrowser/PreferenceDialog.java
Index: PreferenceDialog.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/PreferenceDialog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PreferenceDialog.java 2001/05/14 04:31:09 1.3
+++ PreferenceDialog.java 2001/05/14 05:00:11 1.4
@@ -54,7 +54,7 @@
* Dialog that displays user preferences.
*
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
- * @version $Id: PreferenceDialog.java,v 1.3 2001/05/14 04:31:09 vhardy Exp $
+ * @version $Id: PreferenceDialog.java,v 1.4 2001/05/14 05:00:11 hillion Exp $
*/
public class PreferenceDialog extends JDialog
implements GridBagConstants {
@@ -234,6 +234,13 @@
}
/**
+ * Returns the preference manager used by this dialog.
+ */
+ public PreferenceManager getPreferenceManager() {
+ return model;
+ }
+
+ /**
* Initializes the GUI components with the values
* from the model.
*/
@@ -476,7 +483,7 @@
p.setBorder(BorderFactory.createCompoundBorder
(BorderFactory.createTitledBorder
(BorderFactory.createEtchedBorder(),
- Resources.getString(TITLE_BEHAVIOR)),
+ Resources.getString(TITLE_NETWORK)),
BorderFactory.createEmptyBorder(10, 10, 10, 10)));
return p;
1.5 +7 -3 xml-batik/sources/org/apache/batik/util/gui/LanguageDialog.java
Index: LanguageDialog.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/gui/LanguageDialog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LanguageDialog.java 2001/03/18 16:29:23 1.4
+++ LanguageDialog.java 2001/05/14 05:00:14 1.5
@@ -55,7 +55,7 @@
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
- * @version $Id: LanguageDialog.java,v 1.4 2001/03/18 16:29:23 hillion Exp $
+ * @version $Id: LanguageDialog.java,v 1.5 2001/05/14 05:00:14 hillion Exp $
*/
public class LanguageDialog extends JDialog implements ActionMap {
@@ -367,8 +367,12 @@
*/
public String getLanguages() {
StringBuffer result = new StringBuffer();
- for (int i = 0; i < userListModel.getSize(); i++) {
- result.append(userListModel.getElementAt(i) + ",");
+ if (userListModel.getSize() > 0) {
+ result.append(userListModel.getElementAt(0));
+
+ for (int i = 1; i < userListModel.getSize(); i++) {
+ result.append("," + userListModel.getElementAt(i));
+ }
}
return result.toString();
}
1.2 +1 -1 xml-batik/xdocs/skins/printer/loader.xml
Index: loader.xml
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/loader.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- loader.xml 2000/10/28 22:50:16 1.1
+++ loader.xml 2001/05/14 05:00:16 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- CVS $Revision: 1.1 $ $Date: 2000/10/28 22:50:16 $ -->
+<!-- CVS $Revision: 1.2 $ $Date: 2001/05/14 05:00:16 $ -->
<loader>
<processor name="xslt">
1.2 +13 -21 xml-batik/xdocs/skins/printer/resources/simple.css
Index: simple.css
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/resources/simple.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple.css 2000/10/28 22:50:16 1.1
+++ simple.css 2001/05/14 05:00:18 1.2
@@ -5,59 +5,51 @@
margin: 2em 1em 2em 1em;
}
-h1.title {
- text-align: center;
- color: #005a9c;
- font: 160% sans-serif;
-}
-
h1 {
text-align: left;
color: #005a9c;
- font: 140% sans-serif;
+ font: 170% sans-serif;
}
h2 {
text-align: left;
color: #005a9c;
- font: 120% sans-serif italic;
+ font: 140% sans-serif;
}
h3 {
text-align: left;
color: #005a9c;
- font: 110% sans-serif bold;
+ font: 120% sans-serif;
}
h4 {
text-align: left;
color: #005a9c;
- font: 100% sans-serif bold italic;
+ font: bold 100% sans-serif;
}
+#main-panel {}
+#side-bar {}
+#content-panel {}
+
#s1
#s2
#s3
#s4
p {
- padding: 10px 10px 10px 10px;
- margin: 10px 20px 10px 20px;
- text-align: justify;
+ padding: 10px 10px 10px 10px;
+ margin: 10px 20px 10px 20px;
+ text-align: justify;
}
p.note {
- font-style: italic;
-}
-
-p.legal {
- text-align: center;
- font: 80% sans-serif;
+ font-style: italic;
}
-pre {
+p.source {
font-family: monospace;
- margin: 20px 80px 20px 20px;
}
a:link { color: #005a9c }
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/book2project.xsl
Index: book2project.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/book2project.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- book2project.xsl 2000/10/28 22:50:17 1.1
+++ book2project.xsl 2001/05/14 05:00:21 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<!-- match the root book element -->
<xsl:template match="book">
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/changes2document.xsl
Index: changes2document.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/changes2document.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes2document.xsl 2000/10/28 22:50:17 1.1
+++ changes2document.xsl 2001/05/14 05:00:22 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:import href="copyover.xsl"/>
1.2 +5 -3 xml-batik/xdocs/skins/printer/stylesheets/copyover.xsl
Index: copyover.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/copyover.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copyover.xsl 2000/10/28 22:50:17 1.1
+++ copyover.xsl 2001/05/14 05:00:22 1.2
@@ -1,10 +1,12 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
- <xsl:template match="@*|node()">
+ <xsl:template match="@*|*|text()|processing-instruction()">
<xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
+ <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
</xsl:copy>
</xsl:template>
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/directory2project.xsl
Index: directory2project.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/directory2project.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- directory2project.xsl 2000/10/28 22:50:17 1.1
+++ directory2project.xsl 2001/05/14 05:00:23 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:param name="base"/>
1.3 +25 -17 xml-batik/xdocs/skins/printer/stylesheets/document2html.xsl
Index: document2html.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/document2html.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- document2html.xsl 2000/11/06 03:55:57 1.2
+++ document2html.xsl 2001/05/14 05:00:23 1.3
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/XSL/Transform/1.0">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:import href="copyover.xsl"/>
@@ -21,14 +23,24 @@
<link rel="stylesheet" type="text/css" href="resources/simple.css" title="Simple Style"/>
</head>
<body>
- <p class="legal">Apache Documentation</p>
- <h1 class="title"><xsl:value-of select="document/header/title"/></h1>
- <xsl:apply-templates/>
- <p class="legal">Copyright © <xsl:value-of select="$copyright"/>.<br/>All rights reserved.</p>
+
+ <!-- THE MAIN PANEL (SIDEBAR AND CONTENT) -->
+ <table id="main-panel">
+ <tr>
+ <!-- THE SIDE BAR -->
+ <td id="side-bar" valign="top">
+ <xsl:apply-templates select="document($stylebook.project)"/>
+ </td>
+ <!-- THE CONTENT PANEL -->
+ <td id="content-panel">
+ <xsl:apply-templates/>
+ </td>
+ </tr>
+ </table>
</body>
</html>
</xsl:if>
-
+
<xsl:if test="book">
<xsl:apply-templates/>
</xsl:if>
@@ -55,7 +67,7 @@
<xsl:template match="separator">
<hr/>
</xsl:template>
-
+
<!-- ====================================================================== -->
<!-- header section -->
<!-- ====================================================================== -->
@@ -105,7 +117,7 @@
</xsl:template>
<xsl:template match="source">
- <pre><xsl:apply-templates/></pre>
+ <pre class="source"><xsl:apply-templates/></pre>
</xsl:template>
<xsl:template match="fixme">
@@ -126,14 +138,10 @@
<li>
<strong><xsl:value-of select="."/></strong>
<xsl:text> - </xsl:text>
- <xsl:value-of select="following::dd"/>
+ <xsl:apply-templates select="dd"/>
</li>
- </xsl:template>
-
- <xsl:template match="dd">
- <!-- ignore since already used -->
</xsl:template>
-
+
<!-- ====================================================================== -->
<!-- table section -->
<!-- ====================================================================== -->
@@ -145,7 +153,7 @@
<!-- ====================================================================== -->
<!-- since we cloned the XHTML model, we don't need any futher styling -->
-
+
<!-- ====================================================================== -->
<!-- images section -->
<!-- ====================================================================== -->
@@ -153,7 +161,7 @@
<xsl:template match="figure|img|icon">
<img src="{@src}" alt="{@alt}" class="{name(.)}"/>
</xsl:template>
-
+
<!-- ====================================================================== -->
<!-- links section -->
<!-- ====================================================================== -->
@@ -176,6 +184,6 @@
<xsl:template match="anchor">
<a name="{@id}"><xsl:comment>anchor</xsl:comment></a>
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/document2project.xsl
Index: document2project.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/document2project.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- document2project.xsl 2000/10/28 22:50:17 1.1
+++ document2project.xsl 2001/05/14 05:00:24 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:template match="/">
<project>
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/faqs2document.xsl
Index: faqs2document.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/faqs2document.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- faqs2document.xsl 2000/10/28 22:50:17 1.1
+++ faqs2document.xsl 2001/05/14 05:00:24 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:import href="copyover.xsl"/>
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/scan4resources.xsl
Index: scan4resources.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/scan4resources.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scan4resources.xsl 2000/10/28 22:50:17 1.1
+++ scan4resources.xsl 2001/05/14 05:00:25 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:template match="/">
<project>
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/spec2html.xsl
Index: spec2html.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/spec2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spec2html.xsl 2000/10/28 22:50:17 1.1
+++ spec2html.xsl 2001/05/14 05:00:25 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<!-- ====================================================================== -->
<!-- inherit the document2html templates -->
1.2 +3 -1 xml-batik/xdocs/skins/printer/stylesheets/todo2document.xsl
Index: todo2document.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/printer/stylesheets/todo2document.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- todo2document.xsl 2000/10/28 22:50:17 1.1
+++ todo2document.xsl 2001/05/14 05:00:26 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:import href="copyover.xsl"/>
1.2 +1 -1 xml-batik/xdocs/skins/xml.apache.org/loader.xml
Index: loader.xml
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/loader.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- loader.xml 2000/10/28 22:50:17 1.1
+++ loader.xml 2001/05/14 05:00:30 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- CVS $Revision: 1.1 $ $Date: 2000/10/28 22:50:17 $ -->
+<!-- CVS $Revision: 1.2 $ $Date: 2001/05/14 05:00:30 $ -->
<loader>
<processor name="xslt">
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/book2project.xsl
Index: book2project.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/book2project.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- book2project.xsl 2000/10/28 22:50:18 1.1
+++ book2project.xsl 2001/05/14 05:00:32 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<!-- match the root book element -->
<xsl:template match="book">
@@ -176,4 +178,4 @@
</create>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/changes2document.xsl
Index: changes2document.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/changes2document.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes2document.xsl 2000/10/28 22:50:18 1.1
+++ changes2document.xsl 2001/05/14 05:00:33 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:import href="copyover.xsl"/>
@@ -51,4 +53,4 @@
<!-- remove -->
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/context2label.xsl
Index: context2label.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/context2label.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- context2label.xsl 2000/10/28 22:50:18 1.1
+++ context2label.xsl 2001/05/14 05:00:33 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:param name="image"/>
<xsl:param name="color"/>
@@ -18,4 +20,4 @@
</xsl:if>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.2 +6 -4 xml-batik/xdocs/skins/xml.apache.org/stylesheets/copyover.xsl
Index: copyover.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/copyover.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copyover.xsl 2000/10/28 22:50:19 1.1
+++ copyover.xsl 2001/05/14 05:00:33 1.2
@@ -1,11 +1,13 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
- <xsl:template match="@*|node()">
+ <xsl:template match="@*|*|text()|processing-instruction()">
<xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
+ <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
</xsl:copy>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/directory2project.xsl
Index: directory2project.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/directory2project.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- directory2project.xsl 2000/10/28 22:50:19 1.1
+++ directory2project.xsl 2001/05/14 05:00:33 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:param name="base"/>
@@ -16,4 +18,4 @@
</xsl:if>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.4 +11 -9 xml-batik/xdocs/skins/xml.apache.org/stylesheets/document2html.xsl
Index: document2html.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/document2html.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- document2html.xsl 2001/05/03 09:54:26 1.3
+++ document2html.xsl 2001/05/14 05:00:34 1.4
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/XSL/Transform/1.0">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:param name="stylebook.project"/>
<xsl:param name="copyright"/>
@@ -188,7 +190,7 @@
<xsl:template match="s2">
<div align="right">
- <table border="0" width="96%" cellspacing="0" cellpadding="0">
+ <table border="0" width="95%" cellspacing="0" cellpadding="0">
<tr>
<td width="9" height="7" valign="bottom" align="right"><img src="resources/bar-top-left.gif" width="9" height="7" vspace="0" hspace="0" border="0"/></td>
<td background="resources/bar-border-top.gif"><img src="resources/void.gif" width="1" height="5" vspace="0" hspace="0" border="0"/></td>
@@ -208,7 +210,7 @@
<td width="9" height="12" valign="top" align="left"><img src="resources/bar-bottom-right.gif" width="9" height="12" vspace="0" hspace="0" border="0"/></td>
</tr>
</table>
- <table border="0" width="96%" cellspacing="0" cellpadding="0">
+ <table border="0" width="95%" cellspacing="0" cellpadding="0">
<tr>
<td>
<font face="arial,helvetica,sanserif" color="#000000"><xsl:apply-templates/></font>
@@ -221,7 +223,7 @@
<xsl:template match="s3">
<div align="right">
- <table border="0" width="94%" cellspacing="0" cellpadding="0">
+ <table border="0" width="90%" cellspacing="0" cellpadding="0">
<tr>
<td width="9" height="7" valign="bottom" align="right"><img src="resources/bar-top-left.gif" width="9" height="7" vspace="0" hspace="0" border="0"/></td>
<td background="resources/bar-border-top.gif"><img src="resources/void.gif" width="1" height="5" vspace="0" hspace="0" border="0"/></td>
@@ -241,7 +243,7 @@
<td width="9" height="12" valign="top" align="left"><img src="resources/bar-bottom-right.gif" width="9" height="12" vspace="0" hspace="0" border="0"/></td>
</tr>
</table>
- <table border="0" width="94%" cellspacing="0" cellpadding="0">
+ <table border="0" width="90%" cellspacing="0" cellpadding="0">
<tr>
<td>
<font face="arial,helvetica,sanserif" color="#000000"><xsl:apply-templates/></font>
@@ -254,7 +256,7 @@
<xsl:template match="s4">
<div align="right">
- <table border="0" width="92%" cellspacing="0" cellpadding="0">
+ <table border="0" width="85%" cellspacing="0" cellpadding="0">
<tr>
<td width="9" height="7" valign="bottom" align="right"><img src="resources/bar-top-left.gif" width="9" height="7" vspace="0" hspace="0" border="0"/></td>
<td background="resources/bar-border-top.gif"><img src="resources/void.gif" width="1" height="5" vspace="0" hspace="0" border="0"/></td>
@@ -274,7 +276,7 @@
<td width="9" height="12" valign="top" align="left"><img src="resources/bar-bottom-right.gif" width="9" height="12" vspace="0" hspace="0" border="0"/></td>
</tr>
</table>
- <table border="0" width="92%" cellspacing="0" cellpadding="0">
+ <table border="0" width="85%" cellspacing="0" cellpadding="0">
<tr>
<td>
<font face="arial,helvetica,sanserif" color="#000000"><xsl:apply-templates/></font>
@@ -298,7 +300,7 @@
<!-- ====================================================================== -->
<xsl:template match="p">
- <p><xsl:apply-templates/></p>
+ <p align="justify"><xsl:apply-templates/></p>
</xsl:template>
<xsl:template match="note">
@@ -377,7 +379,7 @@
<xsl:apply-templates select="dd"/>
</li>
</xsl:template>
-
+
<!-- ====================================================================== -->
<!-- table section -->
<!-- ====================================================================== -->
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/document2image.xsl
Index: document2image.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/document2image.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- document2image.xsl 2000/10/28 22:50:19 1.1
+++ document2image.xsl 2001/05/14 05:00:34 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:param name="label"/>
@@ -17,4 +19,4 @@
</image>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/document2project.xsl
Index: document2project.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/document2project.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- document2project.xsl 2000/10/28 22:50:19 1.1
+++ document2project.xsl 2001/05/14 05:00:34 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:template match="/">
<project>
@@ -16,4 +18,4 @@
<xsl:apply-templates/>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.2 +3 -1 xml-batik/xdocs/skins/xml.apache.org/stylesheets/faqs2document.xsl
Index: faqs2document.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/faqs2document.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- faqs2document.xsl 2000/10/28 22:50:19 1.1
+++ faqs2document.xsl 2001/05/14 05:00:34 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:import href="copyover.xsl"/>
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/scan4resources.xsl
Index: scan4resources.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/scan4resources.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scan4resources.xsl 2000/10/28 22:50:20 1.1
+++ scan4resources.xsl 2001/05/14 05:00:35 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:template match="/">
<project>
@@ -16,4 +18,4 @@
<!-- ignore -->
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
1.2 +3 -1 xml-batik/xdocs/skins/xml.apache.org/stylesheets/spec2html.xsl
Index: spec2html.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/spec2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spec2html.xsl 2000/10/28 22:50:20 1.1
+++ spec2html.xsl 2001/05/14 05:00:35 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<!-- ====================================================================== -->
<!-- inherit the document2html templates -->
1.2 +4 -2 xml-batik/xdocs/skins/xml.apache.org/stylesheets/todo2document.xsl
Index: todo2document.xsl
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/skins/xml.apache.org/stylesheets/todo2document.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- todo2document.xsl 2000/10/28 22:50:20 1.1
+++ todo2document.xsl 2001/05/14 05:00:35 1.2
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
<xsl:import href="copyover.xsl"/>
@@ -28,4 +30,4 @@
</s2>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org