diff --git a/cleanrepo/Program.cs b/cleanrepo/Program.cs index c05116a0..877bd11c 100644 --- a/cleanrepo/Program.cs +++ b/cleanrepo/Program.cs @@ -501,8 +501,9 @@ private static void ReplaceLinks(List linkingFiles, string urlBasePath @"\]:\s(/" + urlBasePath + @"/([^\s]*))", // [ref link]: /basepath/some other text "]*?src[ ]*=[ ]*\"(/" + urlBasePath + "/([^>]*?.(png|gif|jpg|svg)))[ ]*\"", // @"\[.*\]:[ ]*(/" + urlBasePath + @"/(.*\.(png|gif|jpg|svg)))", // [0]: /azure/mydocs/media/pic1.png - @"imageSrc:[ ]*(/" + urlBasePath + @"/([^:]*\.(png|gif|jpg|svg)))", // imageSrc: /azure/mydocs/media/pic1.png + @"image(?:Src|Url):\s*(/" + urlBasePath + @"/([^:]*\.(png|gif|jpg|svg)))", // imageSrc: /azure/mydocs/media/pic1.png or imageUrl: /azure/mydocs/media/pic1.png @":::image[^:]*source=""(/" + urlBasePath + @"/([^:]*\.(png|gif|jpg|svg)))""[^:]*:::" // :::image type="complex" source="/azure/mydocs/media/pic1.png" alt-text="Screenshot."::: + ]; foreach (FileInfo linkingFile in linkingFiles) diff --git a/cleanrepo/Repo.cs b/cleanrepo/Repo.cs index b027e1df..820d012e 100644 --- a/cleanrepo/Repo.cs +++ b/cleanrepo/Repo.cs @@ -22,12 +22,13 @@ class DocFxRepo(string startDirectory, string urlBasePath) @"!\[.*?\]\((?.*?(\.(png|jpg|gif|svg))+)", // ![hello](media/how-to/xamarin.png) "]*?src[ ]*=[ ]*[\"'](?[^>]*?(\\.(png|gif|jpg|svg))+)[ ]*[\"']", // Start icon @"\[.*\]:(?.*?(\.(png|gif|jpg|svg))+)", // [0]: ../../media/how-to/xamarin.png - @"imageSrc:(?[^:]*?(\.(png|gif|jpg|svg))+)", // imageSrc: ./media/vs-mac.svg + @"image(Src|Url):(?[^:]*?(\.(png|gif|jpg|svg))+)", // imageSrc: ./media/vs-mac.svg or imageUrl: ./media/vs-mac.svg @"thumbnailUrl: (?.*?(\.(png|gif|jpg|svg))+)", // thumbnailUrl: /thumbs/two-forest.png "lightbox\\s*=\\s*\"(?.*?(\\.(png|gif|jpg|svg))+)\"", // lightbox="media/azure.png" ":::image [^:]*?source\\s*=\\s*\"(?.*?(\\.(png|gif|jpg|svg))+)(\\?[\\w\\s=\\.]+)?\\s*\"", // :::image type="content" source="media/publish.png?text=Publish dialog." alt-text="Publish dialog."::: "[^\"]*?(\\.(png|gif|jpg|svg))+)\"", // "\\]\\((?[^\\)]*?(\\.(png|jpg|gif|svg)))+(#lightbox)[\\s|\\)]" //](../images/alignment-expansion-large.png#lightbox) + ]; private List? _allMdAndYmlFiles; private List? AllMdAndYmlFiles @@ -214,6 +215,7 @@ internal void OutputImageReferences(bool ocrImages = false, bool filteredOcrImag /// ![Architecture] (./media/ci-cd-flask/Architecture.PNG? raw = true) /// The Light Bulb icon ![Small Light Bulb Icon] (media/vs2015_lightbulbsmall.png "VS2017_LightBulbSmall") /// imageSrc: ./media/vs-mac-2019.svg + /// imageUrl: media/microsoft-365-copilot-hub/copilot-hub-work-1.jpg /// Work Backlogs page shortcuts /// [0]: ../../media/vs-acr-provisioning-dialog-2019.png /// :::image type = "complex" source="./media/seedwork-classes.png" alt-text="Screenshot of the SeedWork folder.":::