diff --git a/src/lay/laySalt.cc b/src/lay/laySalt.cc
index 001fc4354..7ef818c5b 100644
--- a/src/lay/laySalt.cc
+++ b/src/lay/laySalt.cc
@@ -248,11 +248,8 @@ bool remove_from_collection (SaltGrains &collection, const std::string &name)
for (SaltGrains::grain_iterator g = collection.begin_grains (); g != collection.end_grains (); ++g) {
if (g->name () == name) {
- SaltGrains::grain_iterator gnext = g;
- ++gnext;
- collection.remove_grain (g, true);
- res = true;
- g = gnext;
+ res = collection.remove_grain (g, true);
+ break;
}
}
diff --git a/src/lay/laySaltGrainPropertiesDialog.cc b/src/lay/laySaltGrainPropertiesDialog.cc
index bfc24ab6f..5743ea1c1 100644
--- a/src/lay/laySaltGrainPropertiesDialog.cc
+++ b/src/lay/laySaltGrainPropertiesDialog.cc
@@ -536,8 +536,8 @@ SaltGrainPropertiesDialog::accept ()
// doc URL
doc_url_alert->clear ();
if (! m_grain.doc_url ().empty ()) {
- tl::InputStream stream (m_grain.doc_url ());
try {
+ tl::InputStream stream (m_grain.eff_doc_url ());
if (! stream.get (1)) {
throw tl::Exception (tl::to_string (tr ("Empty document")));
}
diff --git a/src/lay/laySaltTemplates.qrc b/src/lay/laySaltTemplates.qrc
index 5eb43cde5..72cfaaede 100644
--- a/src/lay/laySaltTemplates.qrc
+++ b/src/lay/laySaltTemplates.qrc
@@ -7,6 +7,10 @@
salt_templates/font/grain.xml
+ salt_templates/font/fonts/new_font.gds
+
+
+ salt_templates/font/doc/readme.html
@@ -39,6 +43,10 @@
salt_templates/pymacro/grain.xml
+ salt_templates/pymacro/pymacros/new_macro.lym
+
+
+ salt_templates/pymacro/doc/readme.html
diff --git a/src/lay/salt_templates/font/doc/readme.html b/src/lay/salt_templates/font/doc/readme.html
new file mode 100644
index 000000000..e38e9765a
--- /dev/null
+++ b/src/lay/salt_templates/font/doc/readme.html
@@ -0,0 +1,43 @@
+
+
+
+Your new Package
+
+
+Your new package is there! You can edit the package properties in the package manager.
+Use the edit button in the upper right corner of the package details panel to
+open the package editor.
+
+
+
+Here is what you should do:
+
+
+
+ - Change the name of the font layout file to a unique name
+ - Choose a license model
+ - Provide an icon and optionally a screenshot image
+
+
+
+Edit the font's layout to define the glyphs. Don't forget to update the metadata
+in the "COMMENT" cell. The metadata helps the PCell to compute properties
+of the font.
+
+
+
+In the package details you will find the local path to your package
+data under "Installation". You can use any versioning system to manage your
+files there.
+
+
+
+Once you have finished your package, don't forget to specify the package version
+so users of you package will be informed of updates. Finally you can publish the
+package files to a place of your choice and submit the download URL to the
+Salt Mine server.
+
+
+
+
+
diff --git a/src/lay/salt_templates/font/fonts/new_font.gds b/src/lay/salt_templates/font/fonts/new_font.gds
new file mode 100644
index 000000000..c790edfbb
Binary files /dev/null and b/src/lay/salt_templates/font/fonts/new_font.gds differ
diff --git a/src/lay/salt_templates/font/grain.xml b/src/lay/salt_templates/font/grain.xml
index 593a48147..a0986f035 100644
--- a/src/lay/salt_templates/font/grain.xml
+++ b/src/lay/salt_templates/font/grain.xml
@@ -3,8 +3,8 @@
font
0.0
Font package
- This template provides a font for the Basic.TEXT PCell
-
+ This template provides a font for the Basic.TEXT PCell.
+ doc/readme.html
GPLv3
diff --git a/src/lay/salt_templates/macro/doc/readme.html b/src/lay/salt_templates/macro/doc/readme.html
new file mode 100644
index 000000000..03d1cd383
--- /dev/null
+++ b/src/lay/salt_templates/macro/doc/readme.html
@@ -0,0 +1,46 @@
+
+
+
+Your new Package
+
+
+Your new package is there! You can edit the package properties in the package manager.
+Use the edit button in the upper right corner of the package details panel to
+open the package editor.
+
+
+
+Here is what you should do:
+
+
+
+ - Enter your author details
+ - Choose a license model
+ - Provide an icon and optionally a screenshot image
+ - Specify dependencies if you plan to use items from other packages
+
+
+
+Of course, the most interesting thing is how to add, edit and develop macros within
+your macro package. When the package was initialized, a "macros" folder with a single
+sample macro has been created. You will find this folder in the macro editor
+under the name you have given the package. The name of the sample macro is "new_macro".
+You can add more macros, Ruby and other files there or modify the sample macro.
+
+
+
+In the package details you will find the local path to your package
+data under "Installation". You can use any versioning system to manage your
+files there.
+
+
+
+Once you have finished your package, don't forget to specify the package version
+so users of you package will be informed of updates. Finally you can publish the
+package files to a place of your choice and submit the download URL to the
+Salt Mine server.
+
+
+
+
+
diff --git a/src/lay/salt_templates/macro/grain.xml b/src/lay/salt_templates/macro/grain.xml
index 8f69c4cd0..6d304c519 100644
--- a/src/lay/salt_templates/macro/grain.xml
+++ b/src/lay/salt_templates/macro/grain.xml
@@ -3,7 +3,7 @@
macro
0.0
Ruby Macro
- This template provides a Ruby macro
+ This template provides a Ruby macro.
doc/readme.html
GPLv3
@@ -11,6 +11,6 @@
-
+ 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
diff --git a/src/lay/salt_templates/macro/macros/new_macro.lym b/src/lay/salt_templates/macro/macros/new_macro.lym
new file mode 100644
index 000000000..0a7455cd6
--- /dev/null
+++ b/src/lay/salt_templates/macro/macros/new_macro.lym
@@ -0,0 +1,22 @@
+
+
+ The New Macro
+
+
+ false
+ false
+
+ false
+
+
+ ruby
+
+ # This is the new macro created with the sample macro package
+
+RBA::MessageBox::information("Information", "This is the new macro created with the sample macro package", RBA::MessageBox::Ok)
+
+# In order pull in classes from other packages, just specify these classes
+# in the dependencies of this package. Provided those packages contain macros
+# which are marked as "autorun-early", the will be loaded before this package
+# and their modules and classes will be available.
+
diff --git a/src/lay/salt_templates/pymacro/doc/readme.html b/src/lay/salt_templates/pymacro/doc/readme.html
new file mode 100644
index 000000000..112d34f93
--- /dev/null
+++ b/src/lay/salt_templates/pymacro/doc/readme.html
@@ -0,0 +1,46 @@
+
+
+
+Your new Package
+
+
+Your new package is there! You can edit the package properties in the package manager.
+Use the edit button in the upper right corner of the package details panel to
+open the package editor.
+
+
+
+Here is what you should do:
+
+
+
+ - Enter your author details
+ - Choose a license model
+ - Provide an icon and optionally a screenshot image
+ - Specify dependencies if you plan to use items from other packages
+
+
+
+Of course, the most interesting thing is how to add, edit and develop macros within
+your macro package. When the package was initialized, a "macros" folder with a single
+sample macro has been created. You will find this folder in the macro editor
+under the name you have given the package. The name of the sample macro is "new_macro".
+You can add more macros, Python and other files there or modify the sample macro.
+
+
+
+In the package details you will find the local path to your package
+data under "Installation". You can use any versioning system to manage your
+files there.
+
+
+
+Once you have finished your package, don't forget to specify the package version
+so users of you package will be informed of updates. Finally you can publish the
+package files to a place of your choice and submit the download URL to the
+Salt Mine server.
+
+
+
+
+
diff --git a/src/lay/salt_templates/pymacro/grain.xml b/src/lay/salt_templates/pymacro/grain.xml
index 2b281fcc9..e780101db 100644
--- a/src/lay/salt_templates/pymacro/grain.xml
+++ b/src/lay/salt_templates/pymacro/grain.xml
@@ -3,14 +3,14 @@
macro
0.0
Python Macro
- This template provides a Python macro
-
+ This template provides a Python macro.
+ doc/readme.html
GPLv3
-
+ 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
diff --git a/src/lay/salt_templates/pymacro/pymacros/new_macro.lym b/src/lay/salt_templates/pymacro/pymacros/new_macro.lym
new file mode 100644
index 000000000..4570bcb72
--- /dev/null
+++ b/src/lay/salt_templates/pymacro/pymacros/new_macro.lym
@@ -0,0 +1,22 @@
+
+
+ The New Macro
+
+
+ false
+ false
+
+ false
+
+
+ ruby
+
+ # This is the new macro created with the sample macro package
+
+RBA::MessageBox::information("Information", "This is the new macro created with the sample macro package", RBA::MessageBox::Ok)
+
+# In order pull in classes from other packages, just specify these classes
+# in the dependencies of this package. Provided those packages contain macros
+# which are marked as "autorun-early", they will be loaded before this package
+# and their modules and classes will become available.
+