Varwidth module provided by d.iabo

See #9417.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9d58de4b810bdfed84c1cf253f9c1ef56822f9a5..0b17eb1fc27b0cea33d46d93fcc53ef07f1d7d10 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2185,7 +2185,8 @@ dist_layouts_DATA =\
        layouts/todonotes.module \
        layouts/treport.layout \
        layouts/tufte-book.layout \
-       layouts/tufte-handout.layout
+       layouts/tufte-handout.layout \
+       layouts/varwidth.module
 
 scriptsdir = $(pkgdatadir)/scripts
 dist_scripts_DATA = \

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 2c1249cfafd4c08ae2678e030ca2c9a3bc782dfb..009d9ed16ff043ec39859f635f6feedca566dffe 100644 (file)
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -376,6 +376,7 @@
 \TestPackage{units}
 \TestPackage{url}
 \TestPackage{varioref}
+\TestPackage{varwidth}
 \TestPackage[vietnamese.ldf]{vietnamese}
 \TestPackage{wallpaper}
 \TestPackage{wrapfig}

diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index 1c8da7356555a7b7385874c53f95d2ab5093d4da..ee40697d0414ace0356ee092743f207e71311f78 100644 (file)
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -1,5 +1,5 @@
 #LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 497
+\lyxformat 499
 \begin_document
 \begin_header
 \origin /systemlyxdir/doc/
@@ -6596,7 +6596,7 @@ macros/latex/contrib/todonotes/
 
 \begin_layout Description
 
-\change_inserted -712698321 1409489236
+\change_inserted -712698321 1446371553
 Notes: The package 
 \family sans
 todonotes
@@ -6611,6 +6611,53 @@ TODO
 \end_inset
 
  notes into documents.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted -712698321 1446371571
+Variable-width Minipages module
+\end_layout
+
+\begin_layout Subsubsection
+
+\change_inserted -712698321 1446371576
+varwidth
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1446371554
+Found: 
+\begin_inset Info
+type  "package"
+arg   "varwidth"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1446371591
+CTAN: 
+\family typewriter
+macros/latex/contrib/varwidth/
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1446371666
+Notes: The package 
+\family sans
+varwidth
+\family default
+\color none
+ is used to produce minipages variable (i.
+\begin_inset space \thinspace{}
+\end_inset
+
+e., content-dependent) width.
 \change_unchanged
 
 \end_layout

diff --git a/lib/layouts/varwidth.module b/lib/layouts/varwidth.module
new file mode 100644 (file)
index 0000000..fc69597
--- /dev/null
+++ b/lib/layouts/varwidth.module
@@ -0,0 +1,42 @@
+#\DeclareLyXModule{Variable-width Minipages}
+#DescriptionBegin
+# Adds a 'Minipage (Var. Width)' inset using the varwidth LaTeX package.
+# The varwidth package provides a variable-width minipage, whose resulting
+# width is the width of its contents (if this does not exceed the specified
+# maximum width).
+#
+# The inset has two optional arguments: vertical adjustment (c|t|b) and
+# maximum width (defaults to \linewidth).
+#DescriptionEnd
+#
+# Authors: d.iabo <gm@lyx.org>
+#         Jürgen Spitzmüller <spitz@lyx.org>
+
+Format 49
+
+InsetLayout Flex:Minipage_(Var._Width)
+  LyXType              custom
+  LabelString          "Minipage (var.)"
+  LatexType            Environment
+  LatexName            varwidth
+  Decoration           Classic
+  MultiPar              true
+  CustomPars           true
+  ResetsFont           true
+  LabelFont
+    Color               foreground
+    Size                Small
+  EndFont
+  Argument 1
+    LabelString        "Vert. Adjustment"
+    Tooltip            "Vertical adjustment: c (center), t (top) or b (bottom)"
+  EndArgument
+  Argument 2
+    LabelString        "Max. Width"
+    Tooltip            "Maximum width (default: \linewidth)"
+    DefaultArg                 "\linewidth"
+    Mandatory          1
+  EndArgument
+  Requires             varwidth
+End
+

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 562e0e2a00bc2bf6c693d472c9d03596154b40f9..fb8fb6085a92d8caeee3401337993de4fcbab2fe 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -796,7 +796,8 @@ char const * simplefeatures[] = {
        "pdfcomment",
        "fixme",
        "todonotes",
-       "forest"
+       "forest",
+       "varwidth"
 };
 
 char const * bibliofeatures[] = {