Merge remote-tracking branch 'origin/master' into master-mac-qt6

src/db/db/gsiDeclDbNetlist.cc

@@ -798,7 +798,7 @@ static db::DeviceParameterDefinition *new_parameter_definition (const std::strin
 
 Class<db::DeviceParameterDefinition> decl_dbDeviceParameterDefinition ("db", "DeviceParameterDefinition",
   gsi::constructor ("new", &gsi::new_parameter_definition, gsi::arg ("name"), gsi::arg ("description", std::string ()), gsi::arg ("default_value", 0.0), gsi::arg ("is_primary", true), gsi::arg ("si_scaling", 1.0),
-    "@brief Creates a new parameter definition."
+    "@brief Creates a new parameter definition.\n"
     "@param name The name of the parameter\n"
     "@param description The human-readable description\n"
     "@param default_value The initial value\n"

src/db/db/gsiDeclDbNetlistDeviceExtractor.cc

@@ -348,7 +348,7 @@ Class<GenericDeviceExtractor> decl_GenericDeviceExtractor (decl_dbNetlistDeviceE
    "the device layers. The actual geometries are later available to \\extract_devices\n"
    "in the order the layers are defined.\n"
   ) +
-  gsi::method ("define_opt_layer", (const db::NetlistDeviceExtractorLayerDefinition &(GenericDeviceExtractor::*) (const std::string &name, const std::string &)) &GenericDeviceExtractor::define_layer, gsi::arg ("name"), gsi::arg ("description"),
+  gsi::method ("define_opt_layer", (const db::NetlistDeviceExtractorLayerDefinition &(GenericDeviceExtractor::*) (const std::string &name, size_t fallback, const std::string &)) &GenericDeviceExtractor::define_layer, gsi::arg ("name"), gsi::arg ("fallback"), gsi::arg ("description"),
    "@brief Defines a layer with a fallback layer.\n"
    "@return The layer descriptor object created for this layer (use 'index' to get the layer's index)\n"
    "As \\define_layer, this method allows specification of device extraction layer. In addition to \\define_layout, it features "

testdata/lvs/res_combine1.lvs

@@ -27,6 +27,7 @@ class ResistorExtractor < RBA::GenericDeviceExtractor
   def setup
     define_layer("C", "Conductor")
     define_layer("R", "Resistor")
+    define_opt_layer("tR", 1, "Resistor")
     register_device_class(RBA::DeviceClassResistor::new)
   end
 
@@ -80,7 +81,7 @@ enable_parameter("RPP1", "W")
 disable_parameter("RPP1", "R")
 
 extract_devices(ResistorExtractor::new("RPP1", 0.5), # intentionally wrong: 1565.15/5
-  { "C" => p1trm, "R" => rpp1 })
+  { "C" => p1trm, "R" => rpp1, "tR" => rpp1 })
 
 connect(met1_dg,      cont)
 connect(p1trm,        cont)