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

scripts/compile_glyphs.rb

@@ -1,5 +1,12 @@
 #!/usr/bin/ruby 
 
+# Synopsis:
+#
+#   compile_glyphs.rb
+#
+# This script generates the src/db/db/glyphs.cc text generator's font definitions
+# from the GDS files placed inside the src/db/db/glyphs folder.
+
 files = []
 
 glyph_dir = File.join(File.dirname($0), "..", "src", "db", "db", "glyphs")

scripts/drc_lvs_doc/create_drc_samples.rb

@@ -5,7 +5,7 @@
 class QRCGenerator
 
   def res_path 
-    "src/lay/lay"
+    "src/doc"
   end
 
   def img_path
@@ -13,7 +13,7 @@ class QRCGenerator
   end
 
   def initialize
-    @path = res_path + "/" + "layDRCLVSHelpResources.qrc"
+    @path = res_path + "/" + "docDRCLVSResources.qrc"
     @file = File.open(@path, "w")
     @file.puts("<RCC>")
     @file.puts(" <qresource prefix=\"/help/images\">")

scripts/drc_lvs_doc/extract_doc.rb

@@ -5,7 +5,7 @@ $script_call = $0 + " " + ARGV.join(" ")
 $indirs = [ "src/drc/drc/built-in-macros", "src/lvs/lvs/built-in-macros" ]
 
 $loc = "about"
-$outfiles = "src/lay/lay/doc"
+$outfiles = "src/doc/doc"
 
 def create_ref(mod, s)
   if s =~ /(.*)::(.*)#(.*)/

scripts/make_drc_lvs_doc.sh

@@ -1,14 +1,27 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 inst=$(realpath $(dirname $0))
+scripts=${inst}/drc_lvs_doc
 ld=$(realpath .)
 
 bin="$ld/klayout"
 
 export LD_LIBRARY_PATH=$ld
+export KLAYOUT_HOME=/dev/null
+
+doc_src=../src/doc/doc
+if ! [ -e $doc_src ]; then
+  echo "*** ERROR: missing doc sources ($doc_src) - did you run the script from the build folder below the source tree?"
+  exit 1
+fi
+
+if ! [ -e $bin ]; then
+  echo "*** ERROR: missing klayout binary ($bin) - did you run the script from the build folder?"
+  exit 1
+fi
 
 cd $inst/..
 
-$bin -z -r $inst/create_drc_samples.rb -t -c $inst/klayoutrc_drc_samples
-$inst/extract_doc.rb
+$bin -z -r ${scripts}/create_drc_samples.rb -t -c ${scripts}/klayoutrc_drc_samples
+${scripts}/extract_doc.rb
 

src/ant/ant/RulerConfigPage4.ui

@@ -90,7 +90,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/up.png</normaloff>:/up.png</iconset>
+             <normaloff>:/up_16px.png</normaloff>:/up_16px.png</iconset>
            </property>
           </widget>
          </item>
@@ -104,7 +104,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/add.png</normaloff>:/add.png</iconset>
+             <normaloff>:/add_16px.png</normaloff>:/add_16px.png</iconset>
            </property>
           </widget>
          </item>
@@ -118,7 +118,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/del.png</normaloff>:/del.png</iconset>
+             <normaloff>:/del_16px.png</normaloff>:/del_16px.png</iconset>
            </property>
           </widget>
          </item>
@@ -132,7 +132,7 @@
            </property>
            <property name="icon">
             <iconset resource="../../lay/lay/layResources.qrc">
-             <normaloff>:/down.png</normaloff>:/down.png</iconset>
+             <normaloff>:/down_16px.png</normaloff>:/down_16px.png</iconset>
            </property>
           </widget>
          </item>

src/ant/ant/antPlugin.cc

@@ -151,7 +151,7 @@ PluginDeclaration::implements_editable (std::string &title) const
 bool 
 PluginDeclaration::implements_mouse_mode (std::string &title) const
 {
-  title = "ruler:ruler_mode_group:ruler_templates_group\t" + tl::to_string (tr ("Ruler{Add rulers and annotations}")) + "<:ruler.png>";
+  title = "ruler:ruler_mode_group:ruler_templates_group\t" + tl::to_string (tr ("Ruler{Add rulers and annotations}")) + "<:ruler_24px.png>";
   return true;
 }
 

src/doc/doc.pro

@@ -0,0 +1,19 @@
+
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_doc
+
+include($$PWD/../lib.pri)
+
+DEFINES += MAKE_DOC_LIBRARY
+
+HEADERS = \
+
+FORMS = \
+
+SOURCES = \
+    docForceLink.cc \
+
+RESOURCES = \
+    docResources.qrc \
+    docDRCLVSResources.qrc \
+

src/doc/doc/about/drc_ref.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/drc_ref_drc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/drc_ref_global.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/drc_ref_layer.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/drc_ref_netter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/drc_ref_source.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/lvs_ref.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/lvs_ref_global.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>

src/doc/doc/about/lvs_ref_netter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "klayout_doc.dtd">
 
-<!-- generated by /home/matthias/klayout/master/scripts/extract_doc.rb  -->
+<!-- generated by /home/matthias/klayout/master/scripts/drc_lvs_doc/extract_doc.rb  -->
 <!-- DO NOT EDIT! -->
 
 <doc>